From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Tue, 5 Jan 2010 07:46:35 +0000 (-0800)
Subject: (vc-bzr-diff): Obey vc-disable-async-diff.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8786
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=578ce472187e076751f7a7d766e5c2d4ba010a0d;p=emacs.git

(vc-bzr-diff): Obey vc-disable-async-diff.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f874638f897..e0c6f6c541c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-05  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc-bzr.el (vc-bzr-diff): Obey vc-disable-async-diff.
+
 2010-01-04  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* vc-bzr.el (vc-bzr-state-heuristic): Make it work for lightweight
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index e2560e4c013..fc62696af1d 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -532,7 +532,8 @@ REV non-nil gets an error."
 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
   "VC bzr backend for diff."
   ;; `bzr diff' exits with code 1 if diff is non-empty.
-  (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 'async files
+  (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*")
+	 (if vc-disable-async-diff 1 'async) files
          "--diff-options" (mapconcat 'identity
                                      (vc-switches 'bzr 'diff)
 				     " ")